Revert 4b055b7..0c77623

This rolls back to commit 4b055b751d702c7dd07b07e991dc8d831dd3635e.