Revert a850bb9..e744524

This rolls back to commit a850bb99913fdb4ef2dac749383a76f6accdf1f4.