Revert f8acf30..6150010

This rolls back to commit f8acf30101ee441cd9b1c604a8b212f1b88c3842.