Revert 7ef555e..dc2b5e2

This rolls back to commit 7ef555eead9f3ea6ab09865f67e8bacab92584ca.