Revert 05021d3..1749d88

This rolls back to commit 05021d397291b5a3e401959a043d8935c7564385.