Revert 7f2a200..7885b2a

This rolls back to commit 7f2a2007beff6d5ffbf00cc1ffb4ca89985e22b7.