Revert a8aaf1d..a1680c4

This rolls back to commit a8aaf1dfc0dff1fdeea5dd4d6e92ccf0c59cfc19.