Revert 12bf658..1d1b92e

This rolls back to commit 12bf6589995399ed9fb77725a1487662f9f68895.