Revert 8568207..b579106

This rolls back to commit 85682076e0641c26bad17afbf50da65f25fd88d8.