Revert 36e1225..5191fd0

This rolls back to commit 36e122517fe394a87ac636892dd74632394c2b36.