Revert 8fc7b69..c28ad0c

This rolls back to commit 8fc7b69d3ef1c930f941876e4e7d2cd3b8cebda7.