Revert af6fab8..a051397

This rolls back to commit af6fab88cc312f7631df1ac8310a100fb8cdd612.