Revert 144c9da..1461318

This rolls back to commit 144c9da4ee33ac59bb0c53ed4c90815a625340cd.