Revert 38cfcc9..a3c6f0b

This rolls back to commit 38cfcc98a8589f76d5b134218474b958efd6c8ea.