Revert 9537bb6..9aa0516

This rolls back to commit 9537bb63e4c5881f5e7b9f8498cbba275d58d381.