Revert f60903e..b412799

This rolls back to commit f60903efc33623adc1ba34f59b73755edc9ad0ff.