Revert 24751e6..a748a65

This rolls back to commit 24751e65d739a9a8df9ca1e6afa952f4810c7c62.