Revert 7c850d3..03639f9

This rolls back to commit 7c850d3526569e542d5a7a2b389d13177ca03fd3.