Revert 9866352..669513c

This rolls back to commit 986635283e6a12c8a9a8331d246521aff7d6d0d1.