Revert b4191bb..01a321a

This rolls back to commit b4191bb58946f3ee996082f4dcbadbc95871d262.