Revert 678908c..1c2674b

This rolls back to commit 678908cb5a07829c8a4a5b16fe27018bcff598af.