Revert 8082ba6..48885f0

This rolls back to commit 8082ba666b1ba823e08a3108d27168768fc745dd.