Revert 5564ea5..983f458

This rolls back to commit 5564ea53971f9b23a179f1b83bb3d2d781c8d947.
commit