Revert 4aa0616..a39c0e7

This rolls back to commit 4aa061624cd32f828b9d1385769ff16926a60f43.
Rolling back my commit