Revert 57b3250..5298499

This rolls back to commit 57b32506a1e517c56c3d767cb0b04e67c5a43b33.