Revert 5959e74..5a72f8f

This rolls back to commit 5959e74c3827b395de1db7a7ecb9e59eef249ff4.