Revert 2b1f8b7..6dc1f6b

This rolls back to commit 2b1f8b7f185a7eb17199fca3a94c673c7fbcc00d.