Revert 0d2da06..fcc3148

This rolls back to commit 0d2da062ee6f596d600709e44aef44ff26d93e49.