Revert d871925..3c07806

This rolls back to commit d87192506342aeb29bb51f5c5ca3c6ca533c5153.