Revert 7ea1ae7..fc762a9

This rolls back to commit 7ea1ae725a15693aa3b93e7653731dbc36f6dbab.