Manually reverting #979 for now, in order to fix it properly. :-)