Revert 19fef58..e8ab2df

This rolls back to commit 19fef58a01ec01eb6ba3211d037f0c3df212facd.