Revert 28c0ef8..d00d3ce

This rolls back to commit 28c0ef88b0ba335070062d7bccd15d1de79f1e65.