Revert 2989330..aac2cd6

This rolls back to commit 2989330c688864fce310a6026de882528b1c5649.
.