Revert 0fc5934..210d560

This rolls back to commit 0fc5934fce5e53a8a7d339cd58822321fec6c66b.