Revert c5074c4..143a128

This rolls back to commit c5074c4b7025c6e20161d1406dc050f31cf23460.