Revert c9d58f7..974bfef

This rolls back to commit c9d58f7b333acf57d4223bc177332909bd8bfb07.