Revert 6523be7..7564f2d

This rolls back to commit 6523be77f9903bf136d214ecd0378deae6039042.