Revert 1d1da52..dd9feef

This rolls back to commit 1d1da524f37b51aac64832bc71f104dce1e6ecf2.