Revert 2437bf3..6829903

This rolls back to commit 2437bf34e8ad867e4dda131a2ad2a96e14dc95a5.