Revert 8bc0e78..392e1f3

This rolls back to commit 8bc0e78bf303456da1d659400264c28a6b5bbc3b.