Revert f3a656c..2fda9cc

This rolls back to commit f3a656c86ed66fdda8085caf1924c6d14ca04ed0.