Revert a7ed7d3..ea54071

This rolls back to commit a7ed7d3b3d336e641cebbcfbffec82689df7dac1.
Fixes #1