Revert 8d91394..bd2f7a5

This rolls back to commit 8d9139464f0ffe6fcfbd94049846ca3e6379897e.