Revert 4486e72..cd2e37e

This rolls back to commit 4486e72cbd4a07046cd124f1380ff2ba93b0267c.