Revert a commit that shouldn't have been commited

This reverts commit 5d64a4583170a11ad9778514f3af284885ad844d.