Revert 1a888b8..d4d14b2

This rolls back to commit 1a888b88599bdeaf515ab08c1fb9738de7d62671.