Revert bb71dee..f9b6e6b

This rolls back to commit bb71dee7f857a8cb411505be32355cd9f5036585.