Revert 48fe0a6..4ecfce4

This rolls back to commit 48fe0a6465625b05fa82355b2d551b54098fe6cd.