Revert 0eb4eb0..3b0c278

This rolls back to commit 0eb4eb042591cded78f8d4ec0109ae97dd68bb0b.