Revert 3914c38..a3647f1

This rolls back to commit 3914c38ebd89f714eaf5d743cebf3e235583ba26.