Revert f20e045..ba1c366

This rolls back to commit f20e0458a27fcd8bde0d7f80373d2e45e4fe5bd9.
rb