Revert 2584281..38fb6d7

This rolls back to commit 258428147643d8da4ade85f71f52c6431d1c3ce8.