Revert 1d1e997..1c4cb5c

This rolls back to commit 1d1e997078ba9dab0b8d01fce406adfd912bd3cd.