Revert 738fd17..7a260a0

This rolls back to commit 738fd17d771d7c071953fb55d3758b3698b5a9e2.