Reverting Master back to match Nick's

This reverts commit fe5803a1a9e1eeb8abebd6fec0578dc1e43bad04.