Revert 903b4bd..dacd46e

This rolls back to commit 903b4bd0d717f89dd12d22376ab1cf7a8b2568e3.