Revert 705b3e3..a0b4579

This rolls back to commit 705b3e31ebdd9ec2ae7513c7954c023d6bad53ea.