Revert 4f59b78..da9a83d

This rolls back to commit 4f59b781137aeaa4873492b2b35e37c3fd8b0dbe.