Revert 92864d6..ed930b4

This rolls back to commit 92864d6c32a0e06a3ae0cf58bad166ba2075c24f.