Revert a0a25ed..f3e5c66

This rolls back to commit a0a25edb0ff132306434e5fa6e1710c9cca0bd69.
Revert