Revert a5183ba..3ad9cc4

This rolls back to commit a5183ba8e99fcab267ef8f6f03bd281ef49a3f0c.