Revert 89b99ce..4626755

This rolls back to commit 89b99ce1d06095b4e503f099ad294dcfe00488b1.