Revert 9f28561..9b3d01a

This rolls back to commit 9f28561ad4bc336d7587de72b5843953666ab584.