Revert f1caf6d..9bc680a

This rolls back to commit f1caf6d16682dac1d52e43df4749fcfd6b19e6dc.