Revert 65da515..2df5df6

This rolls back to commit 65da51589be636cc3e0a18ce89fbfa27fc3743b8.