Revert 3327b7a..8bc107f

This rolls back to commit 3327b7a8a6dc430ef8c7cf40779372171e66815f.