Revert 3b834f3..49287d2

This rolls back to commit 3b834f39c5a5be5908ae2a1867d61f32ebecb1f9.