Revert 039a783..5276aa1

This rolls back to commit 039a783a3a8317f498bd44f7473abd7c0726a762.