Revert 951df33..e63d6ae

This rolls back to commit 951df3375109e60297ffb869e7b6a31885b86f8c.