Revert d4f6020..7440c32

This rolls back to commit d4f60208dd6cb2607159b3af19d4d5556da187ea.