Revert 687b3e8..19f8b4a

This rolls back to commit 687b3e8a83c5931dfb7a3b1b0929d76c60b15723.