Revert a1993d9..391253a

This rolls back to commit a1993d946d7103fd89b77212269f636e97791166.