Revert 7089861..1717ecd

This rolls back to commit 708986100261dd0d4b0a8beb2994664c0ddd77c1.