Revert 0e4ccc9..27efd40

This rolls back to commit 0e4ccc922b742f4d68b809ec0fbb80770cbda367.