Revert fa68602..a8bf118

This rolls back to commit fa686020f3fcc7c95e862b6b0eb2e01995b1a61a.