Reverted d1050dd267df67b065ed9c4f2ad077cbfddc8e61
Opens #935