Revert 6b4a0d4..58ffc81

This rolls back to commit 6b4a0d421c34d7c8153718e50583d36c75b625e3.