Revert 938c89a..50e9781

This rolls back to commit 938c89a5e4327b7b4a54f9fd25546fca755f4593.