Revert 8f8471c..0a5fb26

This rolls back to commit 8f8471c7431090dcdb55d4469bd764694a5e93cf.