Revert f885801..ac00e8f

This rolls back to commit f885801cb0d8af97ba8cf8837622abe29b36dda9.