Revert 626018f..7fa1834

This rolls back to commit 626018f2625cde87725014d7feca6e60f8399785.