Revert 06db4ac..9f84bcb

This rolls back to commit 06db4ac68bcd5da7121e4680892eb4cf9d090fb0.