Revert 07da61a..b5218c0

This rolls back to commit 07da61a4c918d560794ff3c77a6421a5df598327.