Revert a5788a4..22cfc5c

This rolls back to commit a5788a4e44c12b1b9a6f916e95f25b099ef6aeb7.