Revert 13a7c93..c06995f

This rolls back to commit 13a7c9305144f97f353af5b8374b475b0fe243c6.