Revert fd596db..ee438fa

This rolls back to commit fd596db6d92d13725da83b253c67ab4cf10df435.