Revert 71b5a29..657d2a8

This rolls back to commit 71b5a29a87bce8c96a90680e0f6bfd49a9914778.