Revert cc0fc25..3a806c0

This rolls back to commit cc0fc25d59acfc00d81c31ec8cc7c61efe751842.