Revert 2d6eda3..b4b2a8c

This rolls back to commit 2d6eda3be61017180491b2fdf242101260441675.