Revert f57a706..7273e22

This rolls back to commit f57a7063721488b7e4204e8a1cad3d804fbcb254.