Revert 4576aee..4572de9

This rolls back to commit 4576aeef5075b53e52db121720894894e3f09d39.