Revert 4f5dad1..de4ef3c

This rolls back to commit 4f5dad1639e6234d8654f6df2778f7f8c398baa8.