Revert 54d1c21..6244d13

This rolls back to commit 54d1c21a55dc7634d08a9f1e02b2a9028967d3dd.