Revert 682f0c1..0295bbd

This rolls back to commit 682f0c1d1a85870bb74fa90229906aa187094bf8.