Revert b58336b..ee691c8

This rolls back to commit b58336b7e15dd54335ed1a6e328041868ae7f700.