Revert 3f8fbf5..0b0583a

This rolls back to commit 3f8fbf5934572d225eba27a47e552b513250cced.