Related to #1494
mentioned in commit 1fe9b7de
@mardelle, why did you revert this? What was wrong with it?