Revert 58c794b..4f95df8

This rolls back to commit 58c794b016c7c1f4d7eb2c3485e02b009d3cdc38.