Revert 3b61555..e624fd2

This rolls back to commit 3b61555f9df2bd723b185def866c01a57033515b.