Revert 17096bc..c49042c

This rolls back to commit 17096bc6e1026f9a0db2dd8b46c04de043db865e.