Revert 9cb5ff3..50a851a

This rolls back to commit 9cb5ff38cde607a36d155c427ad7cf509ae16bb0.