Revert 41b2905..a2fced6

This rolls back to commit 41b29057547aa2445b4cf7387c4aeba8bf055aa0.