Revert 3f48dd3..e2a371c

This rolls back to commit 3f48dd3d68a42b85b6498a59942339e3169aee56.